Remove cruft that was left over from pre-2.15.2