MONKEY FIX overkilled clean up of static references