Cleaned up imports in default interface