Remove incompatible code