remove gmode
remove comment
remove N+1 query