6d121c2 config cleaned up