cleaned up unused properties