Eliminated references to neutron

this should be moved into neutron project