Merge "registration: Remove unused variable"