Eliminated redundant registration code