Get rid of unnecessary methods