Shell cleanup

The app half of cakephp/cakephp#3340