clean-up the init and exit routines so that they use
the same sequence.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>