Clean up cards generation