Clean up files
Merge branch 'master' of https://github.com/cramblda/framework