Eliminate some Obj-C use