Remove fields we replaced from general settings.