Register clean up

Thanks changed :)