Reversing change due to merge errors.
Removed files and offending branches.  Now to reverse the polarity of the neutron flow.