commenting and removing unused properties