removed some (hopefully) extraneous code