Removed unnecessary static variables