Apply fixes and remove unused files.