Removed db dependency