Cleanup some files and fix build