Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb' * commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb': Clean up codes and remove/modify stale codes/comments.
Merge commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb' * commit 'a4d3fae76a5e861df1def65363b244ac4d8889eb': Clean up codes and remove/modify stale codes/comments.