move some stray annotation properties to correct files. Deleted dup comments.