Remove redundant code from the registration module (see #6230)