Removed accessors from previous commit