More server simplifications