Merge "GUI stoppig when plenty of deletions"