Removed crap again

Change-Id: I77fcd962e65219ab9b48c35ec5e049e79b6c9469