EMPIREDB-362 removed generic getters
32 files changed