Cleanup dependencies.
Merge branch 'cleanup' into develop