Since we changed how CAPs are interpreted, we don't need these anymore.

If we need CAPs later, it's a two line patch. Wooooo.