remove unneeded code wrt username