organize dependencies, remove useless deps and clanup duplicates