Cleaning up for the new project. I really
should get better at git.
More cleanup.