Removing dead code and add some comments
Removing dead code and add some comments
Merge with the master