Clean up with observer