Remove incremental store again
Own incremental
Rename