Trade/Keep reversal fixed

Cards marked for keeping were being traded and vica-versa. Also removed some code from older, less efficient versions