Minor improvements using  attributes. Remove non-working sender canonical code