Removed unused properties and invalid conditional code.