cleaned server stuff