some more code clean-up for passed? build, if not passed is fail whether cancel or so