Removed leftovers from last refactoring