Get rid of some unnecessary things