Removed a few unused properties