More cleanup
And more cleanup