Removed unused features.
Cleaning up code.
Cleaning up.