Bit of cleanup, added the remove card function after match.