[1298] Cleaned up data extraction. Approaching ready-to-go-live...