California moves to limit use of drugs and whips