Code Tidy

A small code tidy, no Functional changes.
Remove unused references