Cleanup Engine and Add stop by time overload method