Cleaning up for running servers