Clean up tree
  * see other tree for status

Major WIP

Change-Id: I702500bcee9123aacd9427ba0651e6b71a1e8e3f