Removed old obj-c stuff