Clean up for new desktop