Some cleanup
stuff