remove extraneous code and conditionals in Acquirer and Shooter.