removed componentlocator and inject
merge from latest pull
removed import of componentlocator and inject from all files
Keep removing