[Framework] Clean Up