Yogesh,Dileep | #2230 | fixed datasender actions and removed unused files