Removed lingering direct-observer classes