Remove some lines for testing OC