Old properties and base classes removed, small fix in Util class