BUG: Removing remnants of T1 processing.