Removed unnecessary class properties