Removed control-server again. I'll make my mind up in a minute>