Remove unnecessary helper and register util