I don't think we need the two attributes and deployment strings, do we?