remove obsolete text
standardize accessor names