desktop cleanup and concerns

|translate?