Clean few thunderg code

Change-Id: Ic9ed9da090f7e3aeee54c19cbb4420ef2beca15b
Signed-off-by: RonGokhale <cips173@gmail.com>