Annotation removal (closes #30)