New API's, Legacy Code Clean-up, and Optimization Imports