removed unused term + more Haxe 3.2+ compatibility