remove two forks and switch to cm 12 branchs on more devices