Removed lots of static call (but not all!)