Tidy up delegate code on the overlay