1. Resolved merge conflicts. 2. Resolved go linting issues.
1. Removed tracing 2. Skipped Registration