Cleaning up new "Better card" functionality