Code cleanup, removed OC references to CC-only methods