Fix the remove with data checkbox not working in gtkui
Clean up remove dialog handling a bit more