Removed unused properties