Add cleanup master job back in CI