cleanup and update flops