cop: API cleanup