desktop cleanup and concerns

move this closer to where it's being used