Cleanup

Merge Cleanup into master