Move extra configs out to their own files and use them only when needed