Remove Neutron dependency