Remove left-over from before refactoring