More Card Data Cleanup