I recommend leaving it in for now, and we can deal with the Sufia/Sphere duplication in Redmine#3733.