Clean up unused properties

issues: closes #1583