Clean up registration feature