First pass at removing v1 cartridges