removed redundant C-c/C-d handling code.