Registration tweaks

[jamieparkinson]

There are a few deletions here which might seem odd, and I'm going to add some comments to the PR explaining them