Add missing import and clean up.