Cleanup and reduce overhead of CP1.