Removed some OPPs