Some cleanup
Merge