Stop using static method