Delete unused code
Unused code clean-up