Cleanup

Delete a few unneeded files from master