Kill PSI legacy code