working via observer
Cleanup