Removed old tasks and fixed minor comment nits.