WIP: Write_Blueflood cleanup