remove unnessary code
update server builders