Remove some things not supported anymore