Remove commented code, add enum eCards, tweak pair value against kickers