Remove unused static variables