Refactored code to remove unused properties and remove subsequent redundant tests.