Merge "Remove special cases in installclean"