Creating this issue to track work items for code cleanup. For instance, old function definitions can be simplified based on more recent infrastructure. Feel free to add more work item here. Thanks!