Updated CI support to drop some older stuff