Clean up the OoC code