finalise removal of SHELL code, finishes 56edb6df141d3b3504074526e908f1bd6b13e8e4