Remove intent checking