Continued work on deprecating the now unused functions.