get rid of unnecessary server/ structure