Changed the way dist directories are cleaned-up