Remove widget specific code from soap data source