diff --git a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TimestampDecoratingTimelockService.java b/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TimestampDecoratingTimelockService.java
deleted file mode 100644
index 36257ae9f2b..00000000000
--- a/atlasdb-impl-shared/src/main/java/com/palantir/atlasdb/transaction/impl/TimestampDecoratingTimelockService.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.palantir.atlasdb.transaction.impl;
-
-import com.palantir.lock.v2.AutoDelegate_TimelockService;
-import com.palantir.lock.v2.TimelockService;
-import com.palantir.timestamp.TimestampRange;
-import com.palantir.timestamp.TimestampService;
-
-public class TimestampDecoratingTimelockService implements AutoDelegate_TimelockService {
-    private final TimelockService delegate;
-    private final TimestampService decoratedTimestamps;
-
-    public TimestampDecoratingTimelockService(TimelockService delegate, TimestampService decoratedTimestamps) {
-        this.delegate = delegate;
-        this.decoratedTimestamps = decoratedTimestamps;
-    }
-
-    @Override
-    public boolean isInitialized() {
-        return delegate.isInitialized() && decoratedTimestamps.isInitialized();
-    }
-
-    @Override
-    public long getFreshTimestamp() {
-        return decoratedTimestamps.getFreshTimestamp();
-    }
-
-    @Override
-    public TimestampRange getFreshTimestamps(int numTimestampsRequested) {
-        return decoratedTimestamps.getFreshTimestamps(numTimestampsRequested);
-    }
-
-    @Override
-    public TimelockService delegate() {
-        return delegate;
-    }
-}
diff --git a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TimestampDecoratingTimelockServiceTest.java b/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TimestampDecoratingTimelockServiceTest.java
deleted file mode 100644
index d843347053d..00000000000
--- a/atlasdb-impl-shared/src/test/java/com/palantir/atlasdb/transaction/impl/TimestampDecoratingTimelockServiceTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * (c) Copyright 2018 Palantir Technologies Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.palantir.atlasdb.transaction.impl;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.palantir.lock.v2.TimelockService;
-import com.palantir.timestamp.TimestampService;
-
-public class TimestampDecoratingTimelockServiceTest {
-    private final TimelockService delegate = mock(TimelockService.class);
-    private final TimestampService decoratedTimestamps = mock(TimestampService.class);
-    private final TimelockService decoratingService =
-            new TimestampDecoratingTimelockService(delegate, decoratedTimestamps);
-
-    @Before
-    public void setUp() {
-        when(delegate.isInitialized()).thenReturn(true);
-        when(decoratedTimestamps.isInitialized()).thenReturn(true);
-    }
-
-    @After
-    public void verifyNoOtherCallsOnDelegates() {
-        verifyNoMoreInteractions(delegate, decoratedTimestamps);
-    }
-
-
-    @Test
-    public void isInitializedWhenPrerequisitesAreInitialized() {
-        assertTrue(decoratingService.isInitialized());
-
-        verify(delegate).isInitialized();
-        verify(decoratedTimestamps).isInitialized();
-    }
-
-    @Test
-    public void isNotInitializedWhenScrubberIsNotInitialized() {
-        when(delegate.isInitialized()).thenReturn(false);
-        assertFalse(decoratingService.isInitialized());
-
-        verify(delegate).isInitialized();
-    }
-
-    @Test
-    public void isInitializedWhenPuncherIsNotInitialized() {
-        when(decoratedTimestamps.isInitialized()).thenReturn(false);
-        assertFalse(decoratingService.isInitialized());
-
-        verify(delegate).isInitialized();
-        verify(decoratedTimestamps).isInitialized();
-    }
-
-    @Test
-    public void singleFreshTimestampRoutedToDecoratedService() {
-        decoratingService.getFreshTimestamp();
-        verify(decoratedTimestamps).getFreshTimestamp();
-    }
-
-    @Test
-    public void multipleFreshTimestampsRoutedToDecoratedService() {
-        int numTimestamps = 42;
-        decoratingService.getFreshTimestamps(numTimestamps);
-        verify(decoratedTimestamps).getFreshTimestamps(numTimestamps);
-    }
-
-    @Test
-    public void methodsNotOnTimestampServiceRoutedToDelegateService() {
-        decoratingService.currentTimeMillis();
-        verify(delegate).currentTimeMillis();
-
-        decoratingService.lockImmutableTimestamp();
-        verify(delegate).lockImmutableTimestamp();
-    }
-}