removed legacy CP code