Further cleanup related to caps_per_proc removal