cleaned up some unneeded code