Cleaned-up project to fix build.