Cleaned up imports in interface module