Clean up of unused properties