Remove the bundler code and fix specs