A little more dependency cleanup