Removed unused dependencies, all functionality remains.