Remove checking for dynamic datasources