cleaned up registration