Some cleaning up of mostly desktop samples