Reduce patch of OO core to minimal necessary amount