Much cleanup
More cleanup