* Remove unused dependencies
* Use shorthand for accessing methods in current context