Add 'nobuflisted' and use wipeout