bj debug cleanup