Judge dismisses charges in New Mexico compound case; 2 face new counts