Remove a lot of unused clutter