clean up for multi datasource support