tidying cruft from pre-wagtail-separation days