D710: Cleanup and Misc Changes