Clean-up of dependencies