static init cleanup
static init fix