implement CS0721 CS0723

remove modifier fix rework
#COP-160 fixed