Remove shell options and bundle nsf/gocode