Removed a few things, changed version info

Change-Id: Iee521e1ea2b7ba1124c46ad7a623ca102e95ffcc