Remove check builder