remove database dependence