Remove dead code in preparation for adding a bugfix