Revert "Added Expanded Desktop Tile and qs clean up"

This reverts commit fc1d25078bcc804266d6d781ab21f9091fc8ede6.
QS: Cleanup