remove a dynamic allocation in maps
change PBVs to PBCRs