Progressive Load Improvements - Migration and Cleanup

Progressive Load Improvements - Migration and Cleanup