* Remove deprecation warning
* Minor optimizations