Remove useless include
Remove unused codes
Remove unused code
Read & add step names