Reverted changes, and deleted unused properties.