Register clean up