diff --git a/src/dbnode/persist/fs/msgpack/encoder.go b/src/dbnode/persist/fs/msgpack/encoder.go
index 7706600817..065ef453da 100644
--- a/src/dbnode/persist/fs/msgpack/encoder.go
+++ b/src/dbnode/persist/fs/msgpack/encoder.go
@@ -268,6 +268,7 @@ func (enc *Encoder) encodeLogInfo(info schema.LogInfo) {
 	enc.encodeNumObjectFieldsForFn(logInfoType)
 
 	// Deprecated, have to encode anyways for backwards compatibility, but we ignore the values.
+	// TODO(V1): Remove when we make backwards incompatible changes with an upgrade to V1.
 	enc.encodeVarintFn(info.DeprecatedDoNotUseStart)
 	enc.encodeVarintFn(info.DeprecatedDoNotUseDuration)
 
diff --git a/src/dbnode/storage/storage_mock.go b/src/dbnode/storage/storage_mock.go
index 2e28f3954d..ca3c530506 100644
--- a/src/dbnode/storage/storage_mock.go
+++ b/src/dbnode/storage/storage_mock.go
@@ -1184,7 +1184,7 @@ func (mr *MockdatabaseNamespaceMockRecorder) Bootstrap(start, process interface{
 }
 
 // Flush mocks base method
-func (m *MockdatabaseNamespace) Flush(blockStart time.Time, ShardBootstrapStates ShardBootstrapStates, flush persist.DataFlush) error {
+func (m *MockdatabaseNamespace) Flush(blockStart time.Time, ShardBootstrapStates ShardBootstrapStates, flush persist.FlushPreparer) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Flush", blockStart, ShardBootstrapStates, flush)
 	ret0, _ := ret[0].(error)
@@ -1212,17 +1212,17 @@ func (mr *MockdatabaseNamespaceMockRecorder) FlushIndex(flush interface{}) *gomo
 }
 
 // Snapshot mocks base method
-func (m *MockdatabaseNamespace) Snapshot(blockStart, snapshotTime time.Time, shardBootstrapStatesAtTickStart ShardBootstrapStates, flush persist.DataFlush) error {
+func (m *MockdatabaseNamespace) Snapshot(blockStart, snapshotTime time.Time, flush persist.SnapshotPreparer) error {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Snapshot", blockStart, snapshotTime, shardBootstrapStatesAtTickStart, flush)
+	ret := m.ctrl.Call(m, "Snapshot", blockStart, snapshotTime, flush)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
 // Snapshot indicates an expected call of Snapshot
-func (mr *MockdatabaseNamespaceMockRecorder) Snapshot(blockStart, snapshotTime, shardBootstrapStatesAtTickStart, flush interface{}) *gomock.Call {
+func (mr *MockdatabaseNamespaceMockRecorder) Snapshot(blockStart, snapshotTime, flush interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Snapshot", reflect.TypeOf((*MockdatabaseNamespace)(nil).Snapshot), blockStart, snapshotTime, shardBootstrapStatesAtTickStart, flush)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Snapshot", reflect.TypeOf((*MockdatabaseNamespace)(nil).Snapshot), blockStart, snapshotTime, flush)
 }
 
 // NeedsFlush mocks base method
@@ -1589,7 +1589,7 @@ func (mr *MockdatabaseShardMockRecorder) Bootstrap(bootstrappedSeries interface{
 }
 
 // Flush mocks base method
-func (m *MockdatabaseShard) Flush(blockStart time.Time, flush persist.DataFlush) error {
+func (m *MockdatabaseShard) Flush(blockStart time.Time, flush persist.FlushPreparer) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Flush", blockStart, flush)
 	ret0, _ := ret[0].(error)
@@ -1603,7 +1603,7 @@ func (mr *MockdatabaseShardMockRecorder) Flush(blockStart, flush interface{}) *g
 }
 
 // Snapshot mocks base method
-func (m *MockdatabaseShard) Snapshot(blockStart, snapshotStart time.Time, flush persist.DataFlush) error {
+func (m *MockdatabaseShard) Snapshot(blockStart, snapshotStart time.Time, flush persist.SnapshotPreparer) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Snapshot", blockStart, snapshotStart, flush)
 	ret0, _ := ret[0].(error)
@@ -1645,20 +1645,6 @@ func (mr *MockdatabaseShardMockRecorder) SnapshotState() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SnapshotState", reflect.TypeOf((*MockdatabaseShard)(nil).SnapshotState))
 }
 
-// CleanupSnapshots mocks base method
-func (m *MockdatabaseShard) CleanupSnapshots(earliestToRetain time.Time) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "CleanupSnapshots", earliestToRetain)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// CleanupSnapshots indicates an expected call of CleanupSnapshots
-func (mr *MockdatabaseShardMockRecorder) CleanupSnapshots(earliestToRetain interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CleanupSnapshots", reflect.TypeOf((*MockdatabaseShard)(nil).CleanupSnapshots), earliestToRetain)
-}
-
 // CleanupExpiredFileSets mocks base method
 func (m *MockdatabaseShard) CleanupExpiredFileSets(earliestToRetain time.Time) error {
 	m.ctrl.T.Helper()
@@ -3073,34 +3059,6 @@ func (mr *MockOptionsMockRecorder) PersistManager() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PersistManager", reflect.TypeOf((*MockOptions)(nil).PersistManager))
 }
 
-// SetMinimumSnapshotInterval mocks base method
-func (m *MockOptions) SetMinimumSnapshotInterval(value time.Duration) Options {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SetMinimumSnapshotInterval", value)
-	ret0, _ := ret[0].(Options)
-	return ret0
-}
-
-// SetMinimumSnapshotInterval indicates an expected call of SetMinimumSnapshotInterval
-func (mr *MockOptionsMockRecorder) SetMinimumSnapshotInterval(value interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetMinimumSnapshotInterval", reflect.TypeOf((*MockOptions)(nil).SetMinimumSnapshotInterval), value)
-}
-
-// MinimumSnapshotInterval mocks base method
-func (m *MockOptions) MinimumSnapshotInterval() time.Duration {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "MinimumSnapshotInterval")
-	ret0, _ := ret[0].(time.Duration)
-	return ret0
-}
-
-// MinimumSnapshotInterval indicates an expected call of MinimumSnapshotInterval
-func (mr *MockOptionsMockRecorder) MinimumSnapshotInterval() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MinimumSnapshotInterval", reflect.TypeOf((*MockOptions)(nil).MinimumSnapshotInterval))
-}
-
 // SetDatabaseBlockRetrieverManager mocks base method
 func (m *MockOptions) SetDatabaseBlockRetrieverManager(value block.DatabaseBlockRetrieverManager) Options {
 	m.ctrl.T.Helper()