Minor changes.
Removing unused information.