Agreed - let's roll this into our tidy-up chore.