Apparantly removing stuff is good

Change-Id: Ia6526f25712a5df0abb0256d6523ffc88f6fa98c