Cleaned up dependences.