Remove quite a lot of N_