remove unnecessary and
rename protocol