Remove OC from tables for testing