tidy up registration from #230 #281 #291

tidy up registration from #230 #281 #291