Updated rpi-register template, cleanup