Cleanup (compilation warning)
API simplification (config path already exists in all these case)