Cleanup before merge to master

Cleaned up some files before merging into master.