Update for HaxeFlixel/flixel@25abef643a2e66166c6f7790b71e3f28c233c460  + cleanup