* Code cleanup
* Unuded permission removed
