Clean up the TWRP stuff a bit