Removed unused code unit, added free format x and e schedules to the model.