Removed wrong dependency
Refactoring