I have removed the static variables