Add missing dependencies
Remove unused code