Cleanup from cardview implementation