Merge "Remove Neutron dependencies"