Removing shipping dependency.