Cleanup of Configuration and Messages (#91)