Cosmetic: cleanup imports