major refactoring - removing shell.js