removing some leaks in server