remove d & fix up shell