Removed more unused code
Removed more unused code