Remove kiwi support altogether