Remove excess server setup