Eliminate static references