Some clean up, registration validation implemeneted