Fix UMS
Remove remaining TWRP stuff
Merge pull request #1 from Dark-Passenger/cm-10.1

Fix UMS