Removing legacy dependency.