protocol cleanup :construction: