Replace local config code with library config code

Replace local config code with library config code #682