Trimmed session data for server stop/reboot

Should just be able to merge this one.