Move removal of stock recovery to shutdown sequence