replace OTHER*CARD_IN_HAND_CONDITION with OtherCardInHand factory method
replace condition constant with call to factory method
remove unused filter