remove more configure.instance usages