Haxelib compat + cleanup