Sync with protocal type
Add cleanup for avalon2