Refactoring: Remove incorrect dependencies