Clean up - use base.Message