Removes a couple of lines of workarounds for unsupported CF versions.