small clean up of unneeded code