Removed deprecated functions