some 'register' functions into normal functions.
Removed the few remaining 'return' functions to simplify relay
handling.