Removed legacy dependency