Merge "Clean up Dependencies"