remove restart step and cleanup some testing output