Project issue #1085 - Add comment to the function and added channel-update and upgrade-all to the cleanup process.