Dead code removal, fixes for BeanCounterPlayer