Remove references to nn_hls where not needed (e.g. where we should use DO_2D(2, 2, 2, 2) instead of DO_2D(nn_hls, nn_hls, nn_hls, nn_hls). Keep it where absolutely needed and remove elsewhere. Limit the use of jpi and jpj. nn_hls -1 should not exist anymo