Massive cleanup of observe()