Got rid of unneeded static variables in some classes