Unnecessary static var cleanup