removing opo specific stuff. Moved to opo repo