Removed UI properties var & exceptions where it wwas not needed