[BUGFIX][CLOSES #5] Removing ServiceLocator