Remove duplicate task and misc cleaning.