Remove double-check