Updates to dependences and clean up.