More stray removal