Cleaning up server options a bit more while I'm in here