refactoring and config cleanup cont'd