* Remove redundant code
Merge branch 'protocol-fix' into custom