Move 'new' and 'delete' server oustide of settings