Cristian: update dependency tree, cleanups