Code clean up. Avoid debug creating additional datasource instance.