First cleanup / making the custom finish messages work.