connector api serving cleanup