clean up
change name of setting
1.add server. 2.add active meta data