Remove some dead code. Closes bug #315278.