Removed unused stuff.
Refactored.
Refactored.