removed unused import, fixed typo
Merge remote-tracking branch 'origin/content-cards' into content-cards