Remove/fix debug/error messages
On destroy, restore selection, if possible