Removed dead logic from before the last refactoring