Cleanup for Gnome 3.14