Oc6 cleanup

@ringmaster @danimo @blizzz @schiesbn @karlitschek @PVince81 THX