More Config and init cleanup