Merge "Remove unused neutron_available"