Get rid of some libunity remnants