(refs #115)Remove debug code
(refs #115)Add ShellFactory