Clean up some dead code.