Options and tokens mechanism plus removed output from shutdown hook