cleaing up server changes