removed db dependency