Tidying up a bunch of footprints from various things