Revison: remove all incorrectly used static variables