eliminating some old unneeded code