Further add-ons, job lines are not removed straight away