More cleanup

Still working