Cleanup dependencies

Cleanup dependencies