Improve client module initialization
Clean client supervisor module