Small change. Removed unused code.
Removing unused properties.