Launcher 2 and Remove and change a few things

Change-Id: I6004ae0a98b64399806d5425e3e3e4c5bde01ffc