Remove more files and fix builds