Remove dead code. Closes #495