Revert "working on registration issues"

This reverts commit d076c4ff7c4fde902f2bd15b7ad8a576f3c67599.