cps create bug fix & remove not needs..