move CE checks into wait_for_csb