Remove dead code, fixes #111