cleaned up some unused, commented-out code