EMPIREDB-317
Code cleanup
5 files changed