Move code into __completeRegistration()