more robust cleanup during startup failure