Removed unused properties and imports.