Removing Data Driven Capability Need  a better approach.