Remove unwanted stuff

Change-Id: I408e9a11c53d7571f9b9bca4ace4cf064033e6ef