misc Objective-C clean up