Cleaning up the framework