Fix some leftover merge conflicts in unused code; Add comment on tasks AJAX handling.