Minor refinement in API and deleted some old code comments.