Change withDb type to get rid of lift calls + clean up