cleaner rdServer code