removed legacy shell code