Remove unused code. Closes #3