Use of DbClient and removal of unused feature