Due to #5269 we may have extremities in our DB that we shouldn't have, so lets add a cleanup task such to remove those.