Cleaned up legacy Observation code