Make observer methods optional for observers
Cleanup