EMPIREDB-282
More cleanup
2 files changed