Modifying registration message to remove elements when registraiton is completed.

Change-Id: Ifb584fb8dd8cb1f0c56d23d0819f6120ebced899