Removed X2hat precomputation