dbclient moved to common
remove extra copies of files