Registration ui clean up