Merge "More cleanup for ci directory"