Remove dead method, add new method