storing attributes in annotations, cont.
cleanup