cleanup of configuration api