Remove a bunch of unnecessary clutter