Ajay | #0000 | Removing commented out code
Ajay | #2164 | Refactored disassociate datasender view to ClassBased view