Remove helper and tidy up node option inputs