Nuke leftover code (explained in previous commit)