Removed uncessary injected interface in favor of optional setter
Removed unused interface