improve cleanup, add a message in installer it can be done, closes #2424, update #2418