Testing and cleaning deprecated options