Remove unused dependencies, closes item:30