Remove factor check