Removing some unnecessary, commented-out code as part of #58