Remove dependency on lines from warehouse and company.

review2371002
issue3555