remove sets for comms - incompatible with python
update stages with more annotations