cleanup server definitions

Change-Id: Ic18d8559044ff00469d4cc201176d7436e1c1b15