fixed comments N+1 query
removed zombie views