remove some debug output and restore some boolean then user click on save