Remove DB dependency