Remove Code Mash, add other Charlie confs.