Cleanup, mostly around dependency management