Some cleanup
More cleanup