Removed db passing around