get rid of username reference