Framework Cleanup - Mike