Revert "XD-813 Update BatchJobLocator on XD job removal"

This reverts commit 45341a6ead68cdc78311684936806925654b3f9c.