Remove unused properties