also while you're here, can you remove the version < 3 checks in the rest of the file?