Cleaning out bits of old piece editor as we go, for neatness