Some cleanup
Some more cleanup