Remove v3.1 and v4.0 references

Makes it much easier to phase out v3.0 since there won't be out-of-date v3.1/v4.0 references to worry about.