admin batchjob - remove some redundant code