Removed unused properties and methods