Remove 2.4 support, replace with 3.1 support.