Removed unnecessary packages, and cleanup a bit

PS2:  Put back Gallery

Change-Id: Ib71d04fb57c0043e484f8ef174d2acf0918bb9d1