Speed up GRK

Remove redumndant calculations