Tidy up background_fetch includes