Minor modifications to eliminate unneeded items.