Protocol 2.0 removed

and cleanup