cleaning edit_handler