Better cleanup process to remove old/new .desktop instances