Remove access cruft from things.  Downstream can guard if it wishes