Changed order of methods so they match previous version (easier to diff)
Do not make deprecated method public static if they have been protected previously