Remove 2.1 support