Fix #51 cleanup observer handlers
merged