Abbreviate the code some more by removing registration code