Cleanup and rebrand

Change-Id: Ibb17d9cccdd28e5ca5b3f0e20474bb8d193b4711