Removed todo - the current approach for imports is fine.