Added code to populate cleanup queue & process cleanup jobs