Cleaned up GenGPIR to remove warnings