[TW301] - Core/Scripts: ToCh - More clean ups