Clean check for haxe/std folder a bit
Merge