diff --git a/lib/db/types.ts b/lib/db/types.ts
index 910b13b42..a01f2c88b 100644
--- a/lib/db/types.ts
+++ b/lib/db/types.ts
@@ -1,7 +1,7 @@
 import Sequelize, { DataTypeAbstract, DefineAttributeColumnOptions, DefineAttributes } from 'sequelize';
 import { Address, NodeConnectionInfo } from '../p2p/types';
 import { SwapDeal } from '../swaps/types';
-import { Currency, Pair, OwnOrder, Order } from '../orderbook/types';
+import { Currency, Pair, Order } from '../orderbook/types';
 import { ReputationEvent } from '../constants/enums';
 
 export type SequelizeAttributes<T extends { [key: string]: any }> = DefineAttributes & {
diff --git a/lib/orderbook/types.ts b/lib/orderbook/types.ts
index 04ea13ffb..d38253ab7 100644
--- a/lib/orderbook/types.ts
+++ b/lib/orderbook/types.ts
@@ -1,5 +1,5 @@
 import { SwapClient } from '../constants/enums';
-import { SwapSuccess, SwapFailure } from 'lib/swaps/types';
+import { SwapSuccess, SwapFailure } from '../swaps/types';
 
 export type OrderMatch = {
   maker: Order;
diff --git a/lib/p2p/Pool.ts b/lib/p2p/Pool.ts
index 53988fa9b..510aca3f5 100644
--- a/lib/p2p/Pool.ts
+++ b/lib/p2p/Pool.ts
@@ -15,7 +15,7 @@ import { getExternalIp } from '../utils/utils';
 import assert from 'assert';
 import { ReputationEvent, DisconnectionReason } from '../constants/enums';
 import NodeKey from '../nodekey/NodeKey';
-import { ReputationEventInstance } from 'lib/db/types';
+import { ReputationEventInstance } from '../db/types';
 import semver from 'semver';
 
 const minCompatibleVersion: string = require('../../package.json').minCompatibleVersion;
diff --git a/lib/p2p/packets/types/SessionAckPacket.ts b/lib/p2p/packets/types/SessionAckPacket.ts
index 921d78448..d757eaab6 100644
--- a/lib/p2p/packets/types/SessionAckPacket.ts
+++ b/lib/p2p/packets/types/SessionAckPacket.ts
@@ -1,8 +1,6 @@
 import Packet, { PacketDirection } from '../Packet';
 import PacketType from '../PacketType';
-import { NodeState } from '../../types';
 import * as pb from '../../../proto/xudp2p_pb';
-import { removeUndefinedProps } from '../../../utils/utils';
 
 export type SessionAckPacketBody = {
   ephemeralPubKey: string;
diff --git a/lib/service/Service.ts b/lib/service/Service.ts
index eb025c555..35f3c84b5 100644
--- a/lib/service/Service.ts
+++ b/lib/service/Service.ts
@@ -3,7 +3,6 @@ import Pool from '../p2p/Pool';
 import OrderBook from '../orderbook/OrderBook';
 import LndClient, { LndInfo } from '../lndclient/LndClient';
 import RaidenClient, { RaidenInfo } from '../raidenclient/RaidenClient';
-import Client from '../BaseClient';
 import { EventEmitter } from 'events';
 import errors from './errors';
 import { SwapClient, OrderSide, SwapRole } from '../constants/enums';
@@ -12,7 +11,7 @@ import * as lndrpc from '../proto/lndrpc_pb';
 import { Pair, Order, OrderPortion, PlaceOrderEvent } from '../orderbook/types';
 import Swaps from '../swaps/Swaps';
 import { OrderSidesArrays } from '../orderbook/TradingPair';
-import { SwapSuccess, SwapFailure } from 'lib/swaps/types';
+import { SwapSuccess, SwapFailure } from '../swaps/types';
 
 /**
  * The components required by the API service layer.
diff --git a/lib/swaps/Swaps.ts b/lib/swaps/Swaps.ts
index 569acfea9..4afb6beac 100644
--- a/lib/swaps/Swaps.ts
+++ b/lib/swaps/Swaps.ts
@@ -13,7 +13,7 @@ import assert from 'assert';
 import { SwapDealInstance } from '../db/types';
 import { SwapDeal, SwapSuccess } from './types';
 import { randomBytes } from '../utils/utils';
-import { ResolveRequest } from 'lib/proto/hash_resolver_pb';
+import { ResolveRequest } from '../proto/hash_resolver_pb';
 
 type OrderToAccept = Pick<SwapDeal, 'quantity' | 'price' | 'localId' | 'isBuy'> & {
   quantity: number;