Remove some deprecated functions