Eliminate global methods