more cleanup
Merging master