add twrp config & some clean up

Change-Id: Id0315e7f44511177129c62022b6a361451820e7d