Clear some TODOs and move all obf fields to end of String array in ObfHelper so it is last tried.