More dependency cleanup