Bootstrap: module initialization cleanup