Fix up remaining resource IDs; all converted to FLUXCORE or removed