Further removal of comments
Modified to reflect new function names.