Skip some more db operations when not appropriate