Remove v2.0-v2.1 implementation