Shooter cleanup during code review