More cleanup ; get message value