Merges Cleanup into develop.

Needs to document breaking changes.