Removing a few unused properties