Removed unused code.
Cleanup