Remove KAT references