Bring inline with AOKP

* Some clean up etc..