EMPIREDB-385 simplification
2 files changed