Updated the doc and removed deprecated functions