More CI cleanups