removed cloning from ContextCPS