Clean up for Expanded Desktop