removed all -cp things