Cleanup.
Add custom data source initializer. Still not working.