Cleanup for merge

Cleaning up some files before merging back into master