UPDATE: Some code cleanning of ITSuite.