Remove want_*