Some more Cleanup
Merge branch 'CleanUp'