QT18-Desktop Cleanup