Updated todo comments and removed some unnecessary
Merge origin/master
Updated todo comments and removed some unnecessary