Remove some deprecated functions

Avoid compiler warnings...