Gnome 3.10 support and cleaning