Remove unneeded items and fix-up one item.