Fix call to notify_no_original_message(), begin other cleanup