Change documentation and remove old function