remove null and empty collection overrides