Revert "finishing few registration parts"

This reverts commit 34969d968deabcc8a770a24414b39c5cf5e290c1.