Fix-up naming and remove un-used code from reset-start