Remove some unsupported code