More clean up to get it working on a new project.