Cleaning up registration process

ahead of move to instant registration