Remove unused code.  Closes #8