remove uaf6 special stuff