Ref#29 clear some annotation in messy code