Cleanup some dead code.