Fixed #51 cleanup observer handlers