Various clean-up (#6, #125, 90). Removal of message and form handler. Headers updated.