[FIX] cleanup in imports