Remove other / Add mandatory