clean up & prepare for background job support