Remove special cases from the CI matrix