[Analysis] More removing unrelated code.
[Analysis] Make metadata in IFs consistent.