The Hive012Binding and Hive010Binding are 99% copied from the ManageJob class. I thought about changing a few items but then decided not too as I don't too much experience with the code. However, yes that looks like a good and simple cleanup.