These are not in the cgx file for PSM, so either these remain in this change, or else the cgx file that @kevingadd used needs to be pushed in this commit.