Old comments cleanup