Remove 2.0 support part