cleaning up server issues