Some cleanup
Cleanup