removed unnecessary client & client_db