Cleaned up code / removed non-required dependencies.