Removed broken refactoring