Remove useTank variable