Update SAMAdhi.
Remove useless lines.
Merge branch 'tmpwork'