From b5be162fa2093732916b644a9dcf53c4da2e3913 Mon Sep 17 00:00:00 2001
From: Greg Hysen <greg.hysen@gmail.com>
Date: Tue, 3 Sep 2019 23:30:55 -0700
Subject: [PATCH] Removed frivolous imports to improve readability

---
 contracts/staking/contracts/src/fees/MixinExchangeFees.sol | 2 --
 .../staking/contracts/src/fees/MixinExchangeManager.sol    | 1 -
 contracts/staking/contracts/src/stake/MixinStake.sol       | 5 -----
 .../staking/contracts/src/stake/MixinStakeBalances.sol     | 2 --
 .../staking/contracts/src/stake/MixinStakeStorage.sol      | 3 ---
 contracts/staking/contracts/src/stake/MixinZrxVault.sol    | 2 --
 .../staking/contracts/src/staking_pools/MixinEthVault.sol  | 2 --
 .../contracts/src/staking_pools/MixinStakingPool.sol       | 7 -------
 .../src/staking_pools/MixinStakingPoolRewardVault.sol      | 3 ---
 .../src/staking_pools/MixinStakingPoolRewards.sol          | 4 ----
 contracts/staking/contracts/src/sys/MixinScheduler.sol     | 2 --
 contracts/staking/contracts/src/vaults/EthVault.sol        | 2 --
 .../contracts/src/vaults/StakingPoolRewardVault.sol        | 3 ---
 contracts/staking/contracts/src/vaults/ZrxVault.sol        | 4 +---
 contracts/staking/contracts/test/TestStorageLayout.sol     | 3 ---
 15 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/contracts/staking/contracts/src/fees/MixinExchangeFees.sol b/contracts/staking/contracts/src/fees/MixinExchangeFees.sol
index fe5c467d32..c11261d879 100644
--- a/contracts/staking/contracts/src/fees/MixinExchangeFees.sol
+++ b/contracts/staking/contracts/src/fees/MixinExchangeFees.sol
@@ -45,8 +45,6 @@ import "./MixinExchangeManager.sol";
 /// monopolize a single pool that they all delegate to.
 contract MixinExchangeFees is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage,
     MixinZrxVault,
diff --git a/contracts/staking/contracts/src/fees/MixinExchangeManager.sol b/contracts/staking/contracts/src/fees/MixinExchangeManager.sol
index 5b3808833d..3386052974 100644
--- a/contracts/staking/contracts/src/fees/MixinExchangeManager.sol
+++ b/contracts/staking/contracts/src/fees/MixinExchangeManager.sol
@@ -32,7 +32,6 @@ import "../immutable/MixinStorage.sol";
 contract MixinExchangeManager is
     IStakingEvents,
     MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage
 {
diff --git a/contracts/staking/contracts/src/stake/MixinStake.sol b/contracts/staking/contracts/src/stake/MixinStake.sol
index c05b22dbb6..ffdd9d3f9e 100644
--- a/contracts/staking/contracts/src/stake/MixinStake.sol
+++ b/contracts/staking/contracts/src/stake/MixinStake.sol
@@ -35,14 +35,9 @@ import "./MixinStakeStorage.sol";
 /// @dev This mixin contains logic for managing ZRX tokens and Stake.
 contract MixinStake is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
     MixinScheduler,
-    MixinStakingPoolRewardVault,
-    MixinStakeStorage,
     MixinStakeBalances,
     MixinStakingPoolRewards
 {
diff --git a/contracts/staking/contracts/src/stake/MixinStakeBalances.sol b/contracts/staking/contracts/src/stake/MixinStakeBalances.sol
index e467a80b73..7bd82f8d5c 100644
--- a/contracts/staking/contracts/src/stake/MixinStakeBalances.sol
+++ b/contracts/staking/contracts/src/stake/MixinStakeBalances.sol
@@ -32,8 +32,6 @@ import "./MixinStakeStorage.sol";
 /// **** Read MixinStake before continuing ****
 contract MixinStakeBalances is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage,
     MixinZrxVault,
diff --git a/contracts/staking/contracts/src/stake/MixinStakeStorage.sol b/contracts/staking/contracts/src/stake/MixinStakeStorage.sol
index a0e13dd4cd..3b757b85c1 100644
--- a/contracts/staking/contracts/src/stake/MixinStakeStorage.sol
+++ b/contracts/staking/contracts/src/stake/MixinStakeStorage.sol
@@ -30,11 +30,8 @@ import "./MixinZrxVault.sol";
 /// @dev This mixin contains logic for managing stake storage.
 contract MixinStakeStorage is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
     MixinScheduler
 {
 
diff --git a/contracts/staking/contracts/src/stake/MixinZrxVault.sol b/contracts/staking/contracts/src/stake/MixinZrxVault.sol
index 9cf434aaa8..ff1559b63b 100644
--- a/contracts/staking/contracts/src/stake/MixinZrxVault.sol
+++ b/contracts/staking/contracts/src/stake/MixinZrxVault.sol
@@ -25,8 +25,6 @@ import "../immutable/MixinStorage.sol";
 /// @dev This mixin contains logic for managing and interfacing with the Zrx Vault.
 /// (see vaults/ZrxVault.sol).
 contract MixinZrxVault is
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage
 {
diff --git a/contracts/staking/contracts/src/staking_pools/MixinEthVault.sol b/contracts/staking/contracts/src/staking_pools/MixinEthVault.sol
index 9359efb68e..a011e0fce7 100644
--- a/contracts/staking/contracts/src/staking_pools/MixinEthVault.sol
+++ b/contracts/staking/contracts/src/staking_pools/MixinEthVault.sol
@@ -27,8 +27,6 @@ import "../immutable/MixinStorage.sol";
 /// (see vaults/EthVault.sol).
 contract MixinEthVault is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage
 {
diff --git a/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol b/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
index 5ed2bb86be..25670de766 100644
--- a/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
+++ b/contracts/staking/contracts/src/staking_pools/MixinStakingPool.sol
@@ -58,15 +58,8 @@ import "./MixinStakingPoolRewards.sol";
 /// 3. Leverage the staking power of others by convincing them to delegate to your pool.
 contract MixinStakingPool is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
-    MixinScheduler,
-    MixinStakingPoolRewardVault,
-    MixinStakeStorage,
-    MixinStakeBalances,
     MixinStakingPoolRewards
 {
     using LibSafeMath for uint256;
diff --git a/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewardVault.sol b/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewardVault.sol
index 06995714d3..113b9b49ed 100644
--- a/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewardVault.sol
+++ b/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewardVault.sol
@@ -29,9 +29,6 @@ import "../libs/LibStakingRichErrors.sol";
 /// from within this contract.
 contract MixinStakingPoolRewardVault is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
-    MixinConstants,
     MixinStorage
 {
 
diff --git a/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol b/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol
index fe62fa598a..c90170e6bb 100644
--- a/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol
+++ b/contracts/staking/contracts/src/staking_pools/MixinStakingPoolRewards.sol
@@ -29,14 +29,10 @@ import "./MixinStakingPoolRewardVault.sol";
 
 contract MixinStakingPoolRewards is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage,
-    MixinZrxVault,
     MixinScheduler,
     MixinStakingPoolRewardVault,
-    MixinStakeStorage,
     MixinStakeBalances
 {
 
diff --git a/contracts/staking/contracts/src/sys/MixinScheduler.sol b/contracts/staking/contracts/src/sys/MixinScheduler.sol
index 85c4ee7614..11af142629 100644
--- a/contracts/staking/contracts/src/sys/MixinScheduler.sol
+++ b/contracts/staking/contracts/src/sys/MixinScheduler.sol
@@ -35,8 +35,6 @@ import "../interfaces/IStakingEvents.sol";
 /// and consistent scheduling metric than time. TimeLocks, for example, are measured in epochs.
 contract MixinScheduler is
     IStakingEvents,
-    MixinDeploymentConstants,
-    Ownable,
     MixinConstants,
     MixinStorage
 {
diff --git a/contracts/staking/contracts/src/vaults/EthVault.sol b/contracts/staking/contracts/src/vaults/EthVault.sol
index 9625ed3ba9..ef86f9715e 100644
--- a/contracts/staking/contracts/src/vaults/EthVault.sol
+++ b/contracts/staking/contracts/src/vaults/EthVault.sol
@@ -25,9 +25,7 @@ import "./MixinVaultCore.sol";
 
 /// @dev This vault manages ETH.
 contract EthVault is
-    Authorizable,
     IEthVault,
-    IVaultCore,
     MixinVaultCore
 {
 
diff --git a/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol b/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
index 6235c68dad..8977d70283 100644
--- a/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
+++ b/contracts/staking/contracts/src/vaults/StakingPoolRewardVault.sol
@@ -39,10 +39,7 @@ import "../immutable/MixinConstants.sol";
 /// When in Catastrophic Failure Mode, the Staking contract can still
 /// perform withdrawals on behalf of its users.
 contract StakingPoolRewardVault is
-    Authorizable,
     IStakingPoolRewardVault,
-    IVaultCore,
-    MixinDeploymentConstants,
     MixinConstants,
     MixinVaultCore
 {
diff --git a/contracts/staking/contracts/src/vaults/ZrxVault.sol b/contracts/staking/contracts/src/vaults/ZrxVault.sol
index 898f03d987..6f8e9fc7c5 100644
--- a/contracts/staking/contracts/src/vaults/ZrxVault.sol
+++ b/contracts/staking/contracts/src/vaults/ZrxVault.sol
@@ -34,8 +34,6 @@ import "./MixinVaultCore.sol";
 /// failure mode, it cannot be returned to normal mode; this prevents
 /// corruption of related state in the staking contract.
 contract ZrxVault is
-    Authorizable,
-    IVaultCore,
     IZrxVault,
     MixinVaultCore
 {
@@ -160,7 +158,7 @@ contract ZrxVault is
 
         // notify
         emit ZrxWithdrawnFromVault(msg.sender, owner, amount);
-        
+
         // withdraw ZRX to owner
         zrxToken.transfer(
             owner,
diff --git a/contracts/staking/contracts/test/TestStorageLayout.sol b/contracts/staking/contracts/test/TestStorageLayout.sol
index a0bf09ad57..45a085807f 100644
--- a/contracts/staking/contracts/test/TestStorageLayout.sol
+++ b/contracts/staking/contracts/test/TestStorageLayout.sol
@@ -25,9 +25,6 @@ import "../src/interfaces/IStructs.sol";
 
 
 contract TestStorageLayout is
-    MixinDeploymentConstants,
-    Ownable,
-    MixinConstants,
     MixinStorage
 {
     function assertExpectedStorageLayout()