Revert "Tidying up citation building"

This reverts commit 04eb4258ae9da86962f387e6046180700b896ac7.