Cleans up neutron code

Same as above!