Refactor.
Removed unused.
Up version.