Some cleanup of pcca for new MSM class