Remove a few line items
Merge from develop