Reducing import bloat