Clean up dead code

Fixes #229