cleanups on config API