Clean message no used from the bundle, added context complete to save registration data