remove outdated code
fix MPS-19009 Performance Problem related to this?