Removing unused dependences, still cleaning up