Removing more cruft from that bad merge