CircleCI: More cleanup

Authored by bgamari on Nov 24 2018, 12:08 PM.