Remove the real deprecated functions