Remove unused dependency and performance fixes.