Changed config to remove some extraneous stuff. Not all gone yet.