Clean up of the neutron roles.  See commits for details.