TWRP cleanup for 2.6.1.0

Change-Id: I15439c8f40b0134aff3c2884198e1c107b5b6bfc