Is this else block still needed? Can we just nuke it?