For #209 remove start/end item support.