Some cleaning, fix to work when dispatcher has init file