Tidy up mass storage filter/injector