* Updated versions
* Removed unused methods