Option to remove bb check