cleaning up imports (only those needed by users are imported)