Clean up server options