Refactoring, removed dependencies