Unused code removed

Unused code removed