Yes, code now removed after refactoring.