Dirty cleanup refactoring #9874321 (you don't wanna know, and I don't know either)