Removed simple site call. Added annotations for device operations that
use hardware id to label it and make it required. Same for assignment
token on assignment operations.