Remove support of old contents2 type of annotations