Remove comments, unused tasks