Nuke ||= leftover from refactoring