remove non-working