Started cleaning up the framework files