- Removed deprecated function
* Cleanups