Cleanup unused code and add missing file to project.