Removed deprecated functions

Remove the old deprecated functions since it should be safe.