EMPIREDB-362 code cleanup
13 files changed