Merge "Fix Neutron cleanup"