Revert "cleaned up properties"

This reverts commit ff9d6d53221fa985934e5c188c67c6d11f6942cf.