Removing unnecessary code.  Also fixes #159.