Removed refactoring leftovers