remove n+1 test