Remove stuff

Change-Id: I3cf8cf01d6a9ebc4720a27e9de861f1fb692c57d