clean up rest of plaid namespace, change flannel_core to just flannel