remove db and class dependency