Server cleanup fix