Removed unused code.
Removed more unused code.