Add missing import, remove broken imports