Removing deprecated functions, updating unit tests.
Removing deprecated functions, fixing a FIXME.