Removing extraneous code.  Still needs some fixing