cleanup, moved more functions to class methos for bsmxStages