Merge "Clean up neutron cleanup code"