assorted static vars removal