Cleanup: removed dead code

This should have been part of a5526c2.