Cleanup dependencies
More dependency cleanup