removing unused code
fixing code alignment
removing product name
Merge commit '998869c0f52c5aea6aef4b0e3deeceeb49469442'