cleans up Obj-C++ header

Also eliminates old #if'd-out code.