cleanup and organize dependencies