Removed extra files.
Merge branch 'cleanup'