cleaning up some unneeded code