remove comment
remove N+1 query
remove gmode