Remove dead code (#818)