Remove unused dependencies
Fix searching with type