(ci) Clean up
(ci) Clean up

The problem involves clang, which is used on almost every job, so revert back to ugly fix and clean up.

acgetchell/CDT-plusplus,acgetchell/CDT-plusplus,acgetchell/CDT-plusplus