Remove unused imports, lazy featureProvider init