Restore is_dirty flag use, remove print statements
Remove print statements