Change strong references to weak. Remove unused files.