huge old comments cleanup