Initial clean up for release

Change-Id: If8b56c090d5326cf0c853258de4ac29510b4729a