Updated d-t-m
Updated annotator
Removed obsolete observer-related code