remove bAddin for hypothesis making at evaluation stage and some minor cleanups