EMPIREDB-394 cleanup DBMSHandler
9 files changed