Some cleanup
: