Removed old CO code and added library code instead