Remove unused properties

Change-Id: Ia71fb1c3f895300b1d26e8ae17f6796a7bd8a1ea