Remove some more random stuff :p

Change-Id: Ic196e2059ed6adb16bda84f7aab322835cb67faf