(orcc-native) Code cleaning