More cleanup

About to try a new branch