Fix TODO's on the code

[ag-ramachandran]

With migration on SDK's and general cleanup , we can look at TODO's on the code base as well as fixing lint issues on sonar (low priority)