remove \r from generators
remove explicit declaration for path of optimist package