[PATCH 3/7] xes: Remove leftover code