neutron-scaling: fix some issues, add cleanup