drop CPS support
tidy