Cleanup dependency and distribution