Removed some more framework files and default code