Get rid of a lot of unnecessary functions