Removed objective-c stuff for now