Some changes to ENet TE adding/removing