performance improvement + early removal