Remove dead code
Update #53