cleaned up some unneeded commented out code