Remove newlines in server comments.
Move @note to better place.