Some odd left-over code