Remove Wall remnants.
Fix message creation.