Cleanup of dead code.