Fix plan cleanup
Log current stage of the module
Better job tracking