Get rid of static bugs